Many source files. Ensure calls to 'fatal' end in \n.

diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.c
index 834d9de58e7b16ee5cf2a183328b5353e0de5b4a..2db870f5d519b9437028a2009b21ef97c12a1853 100644 (file)
--- a/gpsbabel/gdb.c
+++ b/gpsbabel/gdb.c
@@ -156,7 +156,7 @@ gdb_find_desc_from_icon_number(const int icon, garmin_formats_e garmin_format)
                                        return i->icon;
                                break;
                        default:
-                               fatal(MYNAME ": unknown garmin format");
+                               fatal(MYNAME ": unknown garmin format.\n");
                }
        }
        return DEFAULTICONDESCR;
@@ -190,7 +190,7 @@ gdb_find_icon_number_from_desc(const char *desc, garmin_formats_e garmin_format)
                        case GARMIN_SERIAL:
                                return i->pcxsymnum;
                        default:
-                               fatal(MYNAME ": unknown garmin format");
+                               fatal(MYNAME ": unknown garmin format.\n");
                        }
                }
        }

diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index bf76d1b5e379fc4440d7091961000b27d0f415ca..7121b6423a37ee76e80251e52742d21210387003 100644 (file)
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -91,7 +91,7 @@ gusb_cmd_send(const garmin_usb_packet *opkt, size_t sz)
        if (r != sz) {
                fprintf(stderr, "Bad cmdsend r %d sz %d\n", r, sz);
                if (r < 0) {
-                       fatal("usb_bulk_write failed. '%s'", 
+                       fatal("usb_bulk_write failed. '%s'\n", 
                                usb_strerror());
                }
        }
@@ -156,12 +156,12 @@ garmin_usb_start(struct usb_device *dev)
 
        udev = usb_open(dev);
        atexit(garmin_usb_teardown);
-       if (!udev) { fatal("usb_open failed"); }
+       if (!udev) { fatal("usb_open failed\n"); }
        /*
         * Hrmph.  No iManufacturer or iProduct headers....
         */
        if (usb_set_configuration(udev, 1) < 0) {
-               fatal("usb_set_configuration failed");
+               fatal("usb_set_configuration failed\n");
        }
 
        if (usb_claim_interface(udev, 0) < 0) {

diff --git a/gpsbabel/jeeps/gpsserial.c b/gpsbabel/jeeps/gpsserial.c
index d1ced34408f121baa317a4f54142c7ab24332dd7..918423adec157742249ccb878f824024cf3b2283 100644 (file)
--- a/gpsbabel/jeeps/gpsserial.c
+++ b/gpsbabel/jeeps/gpsserial.c
@@ -213,7 +213,7 @@ int32 GPS_Serial_Write(int32 ignored, const void *obuf, int size)
        }
        WriteFile (comport, obuf, size, &len, NULL);
        if (len != (DWORD) size) {
-               fatal ("Write error.   Wrote %d of %d bytes.", len, size);
+               fatal ("Write error.   Wrote %d of %d bytes.\n", len, size);
        }
        return len;
 }

diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.c
index 44f15ddda1e85b6fcf4509dd9754f57fd9e3b7f8..7362caf9c382fdfdc028f28e1283941713e91c86 100644 (file)
--- a/gpsbabel/jeeps/gpsusbwin.c
+++ b/gpsbabel/jeeps/gpsusbwin.c
@@ -124,7 +124,7 @@ gusb_open(const char *pname)
 
        if(!DeviceIoControl(usb_handle, IOCTL_GARMIN_USB_BULK_OUT_PACKET_SIZE, NULL, 0,
                        &usb_tx_packet_size, GARMIN_USB_INTERRUPT_DATA_SIZE, &size, NULL)) {
-               fatal("Couldn't get USB packet size");
+               fatal("Couldn't get USB packet size.\n");
        }
 
        if (pdd) {
@@ -192,7 +192,7 @@ gusb_cmd_get(garmin_usb_packet *ibuf, size_t sz)
        if(!DeviceIoControl(usb_handle, IOCTL_GARMIN_USB_INTERRUPT_IN, NULL, 0,
                        buf, GARMIN_USB_INTERRUPT_DATA_SIZE, &rxed, NULL)) {
                GPS_Serial_Error("Ioctl");
-               fatal("ioctl");
+               fatal("ioctl\n");
        }
                buf += rxed;
                sz  -= rxed;

diff --git a/gpsbabel/maggeo.c b/gpsbabel/maggeo.c
index 382719d82e0edff1017bf2bc098fe111c6a1bf42..719ea0aabd322cd15c82fd4c54b52d3c316e4685 100644 (file)
--- a/gpsbabel/maggeo.c
+++ b/gpsbabel/maggeo.c
@@ -68,7 +68,7 @@ maggeo_wr_deinit(void)
 static void
 maggeo_read(void)
 {
-       fatal("Not implemented yet.");
+       fatal("Reading maggeo is not implemented yet.\n");
 }
 
 /*

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index fa538c342138e009b75701b5ac554ef8ebdd59f5..40b7e97c1eaa97b138690fe7eabad0875253ad6a 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -481,7 +481,7 @@ void mapsend_track_hdr(const route_head * trk)
                case 20: verstring = "30"; break;
                case 30: verstring = "34"; break;
                case 40: verstring = "36"; break;
-               default: fatal("Unknown track version."); break;
+               default: fatal("Unknown track version.\n"); break;
        }
 
        hdr.ms_version[0] = verstring[0];

diff --git a/gpsbabel/mapsource.c b/gpsbabel/mapsource.c
index 0a913cc88a03f94aabe97591cc6eb98c0b466fef..0ba7bd83b5ce6af8c62dfbd9eb634f8f6f5a30b5 100644 (file)
--- a/gpsbabel/mapsource.c
+++ b/gpsbabel/mapsource.c
@@ -101,7 +101,7 @@ le_fwrite64(void *ptr, int sz, int ct, FILE *stream)
        unsigned char cbuf[8];
 
        if ((sz != 8) || (ct != 1)) {
-               fatal(MYNAME ": Bad internal arguments to le_fwrite64");
+               fatal(MYNAME ": Bad internal arguments to le_fwrite64.\n");
        }
 
        le_read64(cbuf, ptr);
@@ -187,7 +187,7 @@ mps_find_desc_from_icon_number(const int icon, garmin_formats_e garmin_format)
                                        return i->icon;
                                break;
                        default:
-                               fatal(MYNAME ": unknown garmin format");
+                               fatal(MYNAME ": unknown garmin format.\n");
                }
        }
        return DEFAULTICONDESCR;
@@ -221,7 +221,7 @@ mps_find_icon_number_from_desc(const char *desc, garmin_formats_e garmin_format)
                        case GARMIN_SERIAL:
                                return i->pcxsymnum;
                        default:
-                               fatal(MYNAME ": unknown garmin format");
+                               fatal(MYNAME ": unknown garmin format.\n");
                        }
                }
        }
@@ -267,7 +267,7 @@ int mps_converted_icon_number(const int icon_num, const int mpsver, garmin_forma
                return icon_num;
 
        default:
-               fatal(MYNAME ": unknown garmin format");
+               fatal(MYNAME ": unknown garmin format.\n");
        }
        return def_icon;
 }
@@ -1802,7 +1802,7 @@ mps_read(void)
                fread(&reclen, 4, 1, mps_file_in);
                reclen = le_read32(&reclen);
 
-               if (reclen < 0) fatal (MYNAME ": a record length read from the input file is invalid. \nEither the file is corrupt or unsupported");
+               if (reclen < 0) fatal (MYNAME ": a record length read from the input file is invalid. \nEither the file is corrupt or unsupported.\n");
 
                /* Read the record type "flag" in - using fread in case in the future need more than one char */
                fread(&recType, 1, 1, mps_file_in);

diff --git a/gpsbabel/reverse_route.c b/gpsbabel/reverse_route.c
index 9589c7450ef06c547ad09ef4272244dd7e917189..5ba3a7e32590c48f634c6e228a74c4df255ede70 100644 (file)
--- a/gpsbabel/reverse_route.c
+++ b/gpsbabel/reverse_route.c
@@ -48,7 +48,7 @@ reverse_route_init(const char *args)
                case trkdata: break;
                default:
                        fatal(MYNAME ": This filter only works in track "
-                                       "or route (-t or -r) mode.");
+                                       "or route (-t or -r) mode.\n");
        }
 }
 

diff --git a/gpsbabel/smplrout.c b/gpsbabel/smplrout.c
index cfffe54fff024a3110a506a6585d38fd05bb83a7..bd9fb8dcdc7976d6b35775d36508316654ec68a2 100644 (file)
--- a/gpsbabel/smplrout.c
+++ b/gpsbabel/smplrout.c
@@ -240,7 +240,7 @@ routesimple_init(const char *args) {
                count = atol(countopt);
        }
        else {
-               fatal( MYNAME ": You must specify a maximum size for the new route");
+               fatal( MYNAME ": You must specify a maximum size for the new route with 'count' option.\n");
        }
 }